From e8484805d996a2e935071b5d869a760407015b4c Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Thu, 18 Dec 2014 19:01:37 -0800 Subject: [PATCH] Move all deps to the registry --- Cargo.lock | 144 +++++++++++++++++++++------------------- Cargo.toml | 40 +++-------- src/registry/Cargo.toml | 4 +- src/rustversion.txt | 2 +- 4 files changed, 88 insertions(+), 102 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b710c8ae2..87cebe5ba 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2,168 +2,172 @@ name = "cargo" version = "0.1.0" dependencies = [ - "curl 0.1.0 (git+https://github.com/carllerche/curl-rust)", - "docopt 0.6.13 (git+https://github.com/docopt/docopt.rs)", - "flate2 0.1.0 (git+https://github.com/alexcrichton/flate2-rs)", - "git2 0.0.1 (git+https://github.com/alexcrichton/git2-rs)", - "glob 0.1.0 (git+https://github.com/rust-lang/glob)", + "curl 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "docopt 0.6.15 (registry+https://github.com/rust-lang/crates.io-index)", + "flate2 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "git2 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "glob 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "hamcrest 0.1.0 (git+https://github.com/carllerche/hamcrest-rust.git)", "registry 0.1.0", - "semver 0.1.3 (git+https://github.com/rust-lang/semver)", - "tar 0.1.0 (git+https://github.com/alexcrichton/tar-rs)", - "time 0.1.1 (git+https://github.com/rust-lang/time)", - "toml 0.1.4 (git+https://github.com/alexcrichton/toml-rs)", - "url 0.2.2 (git+https://github.com/servo/rust-url)", + "semver 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "tar 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "toml 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "curl" -version = "0.1.0" -source = "git+https://github.com/carllerche/curl-rust#8e8e28955c3289fa77f7d6eb3962dc87a18df9ce" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "curl-sys 0.1.0 (git+https://github.com/carllerche/curl-rust)", - "url 0.2.2 (git+https://github.com/servo/rust-url)", + "curl-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "curl-sys" -version = "0.1.0" -source = "git+https://github.com/carllerche/curl-rust#8e8e28955c3289fa77f7d6eb3962dc87a18df9ce" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libz-sys 0.1.0 (git+https://github.com/alexcrichton/libz-sys)", - "openssl-sys 0.2.2 (git+https://github.com/sfackler/rust-openssl)", - "pkg-config 0.1.1 (git+https://github.com/alexcrichton/pkg-config-rs)", + "libz-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl-sys 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", + "pkg-config 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "docopt" -version = "0.6.13" -source = "git+https://github.com/docopt/docopt.rs#38cc4572bef4dc5cbcb7526500aa14d1898c426d" +version = "0.6.15" +source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "flate2" -version = "0.1.0" -source = "git+https://github.com/alexcrichton/flate2-rs#c8ecf7a411bc6d43bf885f487c01e536490f2aea" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "miniz-sys 0.1.0 (git+https://github.com/alexcrichton/flate2-rs)", + "miniz-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "gcc" -version = "0.1.0" -source = "git+https://github.com/alexcrichton/gcc-rs#3caf7309ef72644cd56a9d3a6f515ae553683176" - -[[package]] -name = "gcc" -version = "0.1.0" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "git2" -version = "0.0.1" -source = "git+https://github.com/alexcrichton/git2-rs#fda0c5dbcc5ab59cc6b6fe5049be7a4d0b2a4ed7" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libgit2-sys 0.0.1 (git+https://github.com/alexcrichton/git2-rs)", - "time 0.1.1 (git+https://github.com/rust-lang/time)", - "url 0.2.2 (git+https://github.com/servo/rust-url)", + "libgit2-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "glob" -version = "0.1.0" -source = "git+https://github.com/rust-lang/glob#7e1bd4c5917fde41861ee93e067d5d84d3caf5d1" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "hamcrest" version = "0.1.0" -source = "git+https://github.com/carllerche/hamcrest-rust.git#2b9bd6cdae5dcf08acac84371fe889dc8eb5c528" +source = "git+https://github.com/carllerche/hamcrest-rust.git#4ae58daf0b3a853ffd3109e63f94d43e8e623769" [[package]] name = "libgit2-sys" -version = "0.0.1" -source = "git+https://github.com/alexcrichton/git2-rs#fda0c5dbcc5ab59cc6b6fe5049be7a4d0b2a4ed7" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libssh2-sys 0.0.1 (git+https://github.com/alexcrichton/ssh2-rs)", - "openssl-sys 0.2.2 (git+https://github.com/sfackler/rust-openssl)", - "pkg-config 0.1.1 (git+https://github.com/alexcrichton/pkg-config-rs)", + "libssh2-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl-sys 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", + "pkg-config 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "libressl-pnacl-sys" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "pnacl-build-helper 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "libssh2-sys" -version = "0.0.1" -source = "git+https://github.com/alexcrichton/ssh2-rs#982dc47a45a5a2d66ea092ee6bb9503ddcbf36d9" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libz-sys 0.1.0 (git+https://github.com/alexcrichton/libz-sys)", - "openssl-sys 0.2.2 (git+https://github.com/sfackler/rust-openssl)", - "pkg-config 0.1.1 (git+https://github.com/alexcrichton/pkg-config-rs)", + "libz-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl-sys 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", + "pkg-config 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "libz-sys" version = "0.1.0" -source = "git+https://github.com/alexcrichton/libz-sys#6c19f1309966ce5959ec0472a4730f457136f687" +source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "pkg-config 0.1.1 (git+https://github.com/alexcrichton/pkg-config-rs)", + "pkg-config 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "miniz-sys" version = "0.1.0" -source = "git+https://github.com/alexcrichton/flate2-rs#c8ecf7a411bc6d43bf885f487c01e536490f2aea" +source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "gcc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gcc 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "openssl-sys" -version = "0.2.2" -source = "git+https://github.com/sfackler/rust-openssl#6cdd2cf577434ca3473c217e8a272ee965ef131f" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "pkg-config 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "libressl-pnacl-sys 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "pkg-config 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "pkg-config" -version = "0.1.0" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] -name = "pkg-config" -version = "0.1.1" -source = "git+https://github.com/alexcrichton/pkg-config-rs#9a57960fa5c3480e8daa318772f3b0d1c76b572c" +name = "pnacl-build-helper" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "registry" version = "0.1.0" dependencies = [ - "curl 0.1.0 (git+https://github.com/carllerche/curl-rust)", + "curl 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "semver" -version = "0.1.3" -source = "git+https://github.com/rust-lang/semver#c09b5bdf6b2fcaa719da588a7da98b1145264f56" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "tar" -version = "0.1.0" -source = "git+https://github.com/alexcrichton/tar-rs#c431eeae10c0ad008a252127ffa599df5ab2c0ca" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "time" -version = "0.1.1" -source = "git+https://github.com/rust-lang/time#c1c02adb74c6d9424541ae88ceb61de698b10eeb" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "gcc 0.1.0 (git+https://github.com/alexcrichton/gcc-rs)", + "gcc 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "toml" version = "0.1.4" -source = "git+https://github.com/alexcrichton/toml-rs#25e10a82565d81b5243304c835d868a12b179557" +source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "url" -version = "0.2.2" -source = "git+https://github.com/servo/rust-url#c54ef93a7bfdd7a43b33571b9614376aa5279181" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" diff --git a/Cargo.toml b/Cargo.toml index a9ac4a4c7..716b87e75 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,39 +9,21 @@ authors = ["Yehuda Katz ", name = "cargo" path = "src/cargo/lib.rs" -[dependencies.docopt] -git = "https://github.com/docopt/docopt.rs" - -[dependencies.toml] -git = "https://github.com/alexcrichton/toml-rs" +[dependencies] +docopt = "0.6.14" +toml = "0.1.4" +url = "0.2.0" +semver = "0.1.0" +curl = "0.1.0" +tar = "0.1.0" +flate2 = "0.1.0" +git2 = "0.1.0" +glob = "0.1.0" +time = "0.1.0" [dev-dependencies.hamcrest] git = "https://github.com/carllerche/hamcrest-rust.git" -[dependencies.url] -git = "https://github.com/servo/rust-url" - -[dependencies.semver] -git = "https://github.com/rust-lang/semver" - -[dependencies.curl] -git = "https://github.com/carllerche/curl-rust" - -[dependencies.tar] -git = "https://github.com/alexcrichton/tar-rs" - -[dependencies.flate2] -git = "https://github.com/alexcrichton/flate2-rs" - -[dependencies.git2] -git = "https://github.com/alexcrichton/git2-rs" - -[dependencies.glob] -git = "https://github.com/rust-lang/glob" - -[dependencies.time] -git = "https://github.com/rust-lang/time" - [dependencies.registry] path = "src/registry" diff --git a/src/registry/Cargo.toml b/src/registry/Cargo.toml index 94c3e10c6..0d5104b25 100644 --- a/src/registry/Cargo.toml +++ b/src/registry/Cargo.toml @@ -7,5 +7,5 @@ authors = ["Alex Crichton "] name = "registry" path = "lib.rs" -[dependencies.curl] -git = "https://github.com/carllerche/curl-rust" +[dependencies] +curl = "0.1.0" diff --git a/src/rustversion.txt b/src/rustversion.txt index e0243f047..75053c92f 100644 --- a/src/rustversion.txt +++ b/src/rustversion.txt @@ -1 +1 @@ -2014-12-12 +2014-12-15 -- 2.30.2